merge trunk
authorKenichi Handa <handa@gnu.org>
Wed, 10 Oct 2012 14:47:31 +0000 (23:47 +0900)
committerKenichi Handa <handa@gnu.org>
Wed, 10 Oct 2012 14:47:31 +0000 (23:47 +0900)
commit360ac10761d0d80b0cd400325e4aec80be448a01
tree9ff37ff1a7ad46ae235d1349e961829da543a211
parent15b5649d24af2850f70e2220dd40cc8e187c3a96
parent81adaffea4ff887d331e58b601bd24eab8552426
merge trunk